bitkeeper revision 1.1317 (426426e75ONJGdRHoWdYW1_r-sGgsA)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

diff --cc BitKeeper/etc/logging_ok
Simple merge

diff --cc xen/common/schedule.c
index 459e0ee7c6288929ebede52c9bd2affcfabbbaa5,0c437d883425fe38894afebcb8f10ae2ba6220cd..8062fdac73fcae32608a0db662f65baea2762df6
--- 1/xen/common/schedule.c
--- 2/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@@ -386,8 -361,10 +386,8 @@@ static void __enter_scheduler(void
      
      perfc_incrc(sched_ctx);
  
 -    cleanup_writable_pagetable(prev);
 -
  #if defined(WAKE_HISTO)
-     if ( !is_idle_task(next) && next->wokenup ) {
+     if ( !is_idle_task(next->domain) && next->wokenup ) {
          ulong diff = (ulong)(now - next->wokenup);
          diff /= (ulong)MILLISECS(1);
          if (diff <= BUCKETS-2)  schedule_data[cpu].hist[diff]++;